feat(node): Extract Sentry-specific node-fetch instrumentation #15231
+554
−182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mydea
force-pushed
the
fn/node-fetch-custom
branch
from
3ab670c to
4c6e295
Compare
size-limit report 📦
|
mydea
force-pushed
the
fn/node-fetch-custom
branch
from
f44d6a7 to
668c276
Compare
Lms24
reviewed
Jan 31, 2025
Comment on lines
133
to
175
| if (Array.isArray(request.headers)) { | ||
| const requestHeaders = request.headers; | ||
| Object.entries(addedHeaders) | ||
| .filter(([k]) => { | ||
| // If the header already exists, we do not want to set it again | ||
| return !requestHeaders.includes(k); | ||
| }) | ||
| .forEach(keyValuePair => requestHeaders.push(...keyValuePair)); | ||
| } else { | ||
| const requestHeaders = request.headers; | ||
| request.headers += Object.entries(addedHeaders) | ||
| .filter(([k]) => { | ||
| // If the header already exists, we do not want to set it again | ||
| return !requestHeaders.includes(`${k}:`); | ||
| }) | ||
| .map(([k, v]) => `${k}: ${v}\r\n`) | ||
| .join(''); | ||
| } | ||
| } |
There was a problem hiding this comment.
m: same concern about the baggage header as in #15233 (comment)
There was a problem hiding this comment.
yeah, I'll pull this in from the other PR after merging that!
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts
Outdated
Show resolved
Hide resolved
mydea
added a commit
that referenced
this pull request
Jan 31, 2025
Related to #15231, I noticed that we today would not propagate traces in outgoing http requests if: 1. The user configures `httpIntegration({ spans: false })` 2. ..._or_ the user has a custom OTEL setup 3. _and_ the user does not add their own `HttpInstrumentation` Admittedly and edge case. More importantly, though, by actually adding distributed tracing information here, we are unblocked from potentially stopping to ship the http-instrumentation to users that do not need spans (and/or have a custom otel setup). --------- Co-authored-by: Lukas Stracke <[email protected]>
To allow users to opt-out of using the otel instrumentation.
mydea
force-pushed
the
fn/node-fetch-custom
branch
from
653a5d8 to
07e8184
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR basically mirrors what we did here: #13763
to ensure that the UndiciInstrumentation from fetch can be safely removed.
With this change, if
spans: falseis configured and/orskipOpenTelemetrySetup: true, no core otel instrumentations will be added anymore at all. This should also make it easier when in a follow up step we make this completely optional, allowing us to drop all instrumentation dependencies for these cases.While doing this I noticed that we should probably also adjust our custom http instrumentation to inject sentry-trace as well, to fully decouple this. I'll check this out separately...
Closes #15212
Possible extension in the future: Also capture fetch request bodies. (We already do not do this today, but may add this at some point...)